Skip to content

fix: harden session routing and nested worktrees - #485

Merged
ScriptedAlchemy merged 5 commits into
masterfrom
codex/follow-up-pr481-cargo
Aug 3, 2026
Merged

fix: harden session routing and nested worktrees#485
ScriptedAlchemy merged 5 commits into
masterfrom
codex/follow-up-pr481-cargo

Conversation

@ScriptedAlchemy

Copy link
Copy Markdown
Owner

Summary

  • clear inherited Git discovery overrides before repository probes
  • preserve unknown project-root matches so affected session sources defer instead of dropping data
  • cooldown-cache unknown root matches
  • exclude .worktrees and .codex-worktrees from parent Cargo workspace discovery

Validation

  • focused Git, routing, Vibe, Kiro, Cline-like, and Cursor Composer tests pass
  • nested Cargo worktree probes pass
  • commit subjects and diff validation pass
  • full cross-platform CI is the broad gate

@changeset-bot

changeset-bot Bot commented Aug 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: b9c066a

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c097fb820c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread Cargo.toml Outdated
Comment on lines +13 to +14
[workspace]
exclude = [".worktrees", ".codex-worktrees"]

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep package include in the package table

Placing [workspace] here changes the scope of the subsequent include = [...], so Cargo interprets it as the unsupported workspace.include key and the package loses its explicit whitelist. As a result, cargo package omits the gitignored dashboard dist assets that the whitelist deliberately ships, leaving published builds to attempt an npm rebuild or fail when npm/assets are unavailable; move the workspace table below the package-specific keys.

Useful? React with 👍 / 👎.

}
}
ProjectMembership::NoMatch => {}
ProjectMembership::Unknown => return None,

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Let a definitive Cline path match override unknown paths

When Cline metadata contains both a path that definitively belongs to project_root and another stale or network-backed path whose Git lookup times out, this branch returns None and discards the already-recorded match. Such multi-path metadata previously used any matching path, so a consistently inaccessible auxiliary path can now prevent a valid task from ever being ingested; accumulate Unknown and defer only when no path produced Match.

Useful? React with 👍 / 👎.

@ScriptedAlchemy
ScriptedAlchemy merged commit 495ba7d into master Aug 3, 2026
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant